From 69856a9aacfec7c23e9719228ba57664dbe69cdd Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 10 May 2021 21:19:14 +0100 Subject: [PATCH] x11: Don't update GLX visuals with EGL We're going to get into a messy situation, with both GLX and EGL initialized. If we're already using EGL, skip the whole cache. --- gdk/x11/gdkglcontext-glx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gdk/x11/gdkglcontext-glx.c b/gdk/x11/gdkglcontext-glx.c index d9f9cf51d4..4181168262 100644 --- a/gdk/x11/gdkglcontext-glx.c +++ b/gdk/x11/gdkglcontext-glx.c @@ -1022,6 +1022,9 @@ gdk_x11_screen_update_visuals_for_glx (GdkX11Screen *x11_screen) display_x11 = GDK_X11_DISPLAY (display); dpy = gdk_x11_display_get_xdisplay (display); + if (display_x11->have_egl) + return; + /* We save the default visuals as a property on the root window to avoid having to initialize GL each time, as it may not be used later. */ if (get_cached_gl_visuals (display, &system_visual_id, &rgba_visual_id)) -- 2.30.2